Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-101845: pyspecific: Fix i18n for availability directive #101846

Merged
merged 1 commit into from
Feb 12, 2023

Conversation

jeanas
Copy link
Contributor

@jeanas jeanas commented Feb 12, 2023

If the directive has content, the previous code would nest paragraph nodes from that content inside a general paragraph node, which confuses Sphinx and leads it to drop the content when translating. Instead, use a container node for the body.

Also use set_source_info so that any warnings have location info.

If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
@jeanas
Copy link
Contributor Author

jeanas commented Feb 12, 2023

@jeanas
Copy link
Contributor Author

jeanas commented Feb 12, 2023

I guess this can skip NEWS?

@jeanas
Copy link
Contributor Author

jeanas commented Feb 12, 2023

Also CC @AA-Turner, maybe you want to take a look?

@arhadthedev arhadthedev added docs Documentation in the Doc dir skip news build The build process and cross-build labels Feb 12, 2023
@JulienPalard
Copy link
Member

I tested it on an english and a french build: it works as expected.

@jeanas jeanas deleted the availability-i18n branch February 12, 2023 14:33
@jeanas
Copy link
Contributor Author

jeanas commented Feb 12, 2023

Thanks for merging!

@jeanas
Copy link
Contributor Author

jeanas commented Feb 12, 2023

BTW, this needs to be backported, right?

@JulienPalard
Copy link
Member

BTW, this needs to be backported, right?

Right.

@JulienPalard JulienPalard added the needs backport to 3.11 only security fixes label Feb 12, 2023
@miss-islington
Copy link
Contributor

Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-101852 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 12, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 12, 2023
…honGH-101846)

pyspecific: Fix i18n for availability directive

If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
(cherry picked from commit 6ef6915)

Co-authored-by: Jean Abou-Samra <[email protected]>
@JulienPalard
Copy link
Member

It'll need a backport to 3.10 too but will probabily not succeed automatically.

@JulienPalard JulienPalard added the needs backport to 3.10 only security fixes label Feb 12, 2023
@miss-islington
Copy link
Contributor

Thanks @jeanas for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @jeanas and @JulienPalard, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6ef6915d3530e844243893f91bf4bd702dfef570 3.10

miss-islington added a commit that referenced this pull request Feb 12, 2023
pyspecific: Fix i18n for availability directive

If the directive has content, the previous code would nest paragraph
nodes from that content inside a general paragraph node, which confuses
Sphinx and leads it to drop the content when translating. Instead, use a
container node for the body.

Also use set_source_info so that any warnings have location info.
(cherry picked from commit 6ef6915)

Co-authored-by: Jean Abou-Samra <[email protected]>
carljm added a commit to carljm/cpython that referenced this pull request Feb 13, 2023
* main:
  pythongh-101810: Remove duplicated st_ino calculation (pythonGH-101811)
  pythongh-92547: Purge sqlite3_enable_shared_cache() detection from configure (python#101873)
  pythonGH-100987: Refactor `_PyInterpreterFrame` a bit, to assist generator improvement. (pythonGH-100988)
  pythonGH-87849: Simplify stack effect of SEND and specialize it for generators and coroutines. (pythonGH-101788)
  Correct trivial grammar in reset_mock docs (python#101861)
  pythongh-101845: pyspecific: Fix i18n for availability directive (pythonGH-101846)
  pythongh-89792: Limit test_tools freeze test build parallelism based on the number of cores (python#101841)
  pythongh-85984: Utilize new "winsize" functions from termios in pty tests. (python#101831)
  pythongh-89792: Prevent test_tools from copying 1000M of "source" in freeze test (python#101837)
  Fix typo in test_fstring.py (python#101823)
  pythonGH-101797: allocate `PyExpat_CAPI` capsule on heap (python#101798)
  pythongh-101390: Fix docs for `imporlib.util.LazyLoader.factory` to properly call it a class method (pythonGH-101391)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build The build process and cross-build docs Documentation in the Doc dir needs backport to 3.10 only security fixes skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants